Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 22:40:44 +0000 (14:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 22:40:44 +0000 (14:40 -0800)
commit87973f19b842b56b30338b9bbbae7bf4f53eee3e
tree23d38bfd37c0fad15fa17b352cd5b91c44044a70
parente0f4e3c9be4685f00b26759a972c7c0d5fd7f324
parent305cc1b49b59b9304fd3a0274750f5784076f235
Merge from mainline.